From 5191e341b431e3a02dae9312c2eb8297fd860f57 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 13 Dec 2004 05:35:17 +0000 Subject: [PATCH] Don't let the empty menu filler affect visibility of separators. (#160500, 2004-12-13 Matthias Clasen * gtk/gtkuimanager.c (update_smart_separators): Don't let the empty menu filler affect visibility of separators. (#160500, Christian Persch) --- ChangeLog | 6 ++++++ ChangeLog.pre-2-10 | 6 ++++++ ChangeLog.pre-2-6 | 6 ++++++ ChangeLog.pre-2-8 | 6 ++++++ gtk/gtkuimanager.c | 10 +++++----- 5 files changed, 29 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0a1c754e97..c6b2cf07d5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-12-13 Matthias Clasen + + * gtk/gtkuimanager.c (update_smart_separators): Don't let the + empty menu filler affect visibility of separators. (#160500, + Christian Persch) + 2004-12-12 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 0a1c754e97..c6b2cf07d5 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,9 @@ +2004-12-13 Matthias Clasen + + * gtk/gtkuimanager.c (update_smart_separators): Don't let the + empty menu filler affect visibility of separators. (#160500, + Christian Persch) + 2004-12-12 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 0a1c754e97..c6b2cf07d5 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,9 @@ +2004-12-13 Matthias Clasen + + * gtk/gtkuimanager.c (update_smart_separators): Don't let the + empty menu filler affect visibility of separators. (#160500, + Christian Persch) + 2004-12-12 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 0a1c754e97..c6b2cf07d5 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,9 @@ +2004-12-13 Matthias Clasen + + * gtk/gtkuimanager.c (update_smart_separators): Don't let the + empty menu filler affect visibility of separators. (#160500, + Christian Persch) + 2004-12-12 Matthias Clasen * gtk/gtkcombobox.c (gtk_combo_box_menu_row_changed): Pass a diff --git a/gtk/gtkuimanager.c b/gtk/gtkuimanager.c index b5c9379cca..e507a75e00 100644 --- a/gtk/gtkuimanager.c +++ b/gtk/gtkuimanager.c @@ -1959,7 +1959,6 @@ update_smart_separators (GtkWidget *proxy) else if (GTK_IS_MENU_ITEM (proxy) || GTK_IS_TOOL_ITEM (proxy)) parent = gtk_widget_get_parent (proxy); - if (parent) { gboolean visible; @@ -1980,10 +1979,11 @@ update_smart_separators (GtkWidget *proxy) while (cur) { if (g_object_get_data (cur->data, "gtk-empty-menu-item")) - filler = cur->data; - - if (GTK_IS_SEPARATOR_MENU_ITEM (cur->data) || - GTK_IS_SEPARATOR_TOOL_ITEM (cur->data)) + { + filler = cur->data; + } + else if (GTK_IS_SEPARATOR_MENU_ITEM (cur->data) || + GTK_IS_SEPARATOR_TOOL_ITEM (cur->data)) { gint mode = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (cur->data), -- 2.30.2